DAT-2182 Implement saving of module data