DIC refactoring
Removed helpers from the core lib