More work on module loader