Add support for extra locations.