Added the rest of the custom location fields