Added CreateLocation
Added EditLocation