Loader module small refactor along with some core modules