Colombia government already including FARC deals in long-term planning