Modified design to include Service subtypes and 1 to many locations