EquipmentMaintenance: Organised data for 'maintenace work' with join and introduced more relavent names to some methods