[BUGFIX] Make sure module data is correct

Added some load enhancements