added support for ioc container adapter, minor refactoring