Refatored generator to planexecutor