Move service declaration to DI configuration