Add geometries for clients

WIP