Added string and map support for locations.