Added SerializableLocation