Maintain master data : refs #307