Reworked plan creation workflow