New framework structure
Includes fixed