Added code for DI