IoC/DI support, some bug fixes and integration tests added