Added the location and person structures