Update core to use services and dependencies