Plan factory methods implemented
Clean up Plan factory
Implemented the factory for the Astral_... problem