fixed issue with alternate config type not being injected. Other refactoring