Adding Support for Grace (DI container)