Added support for original locations.