Added field for invoicing id.
Changed locationType to hash