Refine State Space Generation
Functionality Changes