Some changes to loader module. Pushing changes but not final yet