Added support for @service_container