Added support for identifying city