Added missed DI configs and fixed namespaces.