Added UUID to location and locationForm