Improve options for location serialization