Added management of planning