Added support for visible locations