Add support for entities with two attributes for the latitude and longitude parameters