optimise imports and remove dependency back from core to handlers
Update headers