Made suggested changes from Steffen on using CONSTANTS to allow easily changing names of the properties we are using.