Adding support for where people are