Re-structured data load to add module registration