Engine refractoring V0.2