Refatored generator to planexecutor (#5)