Update Locations to allow for greater detail.

Fixes #272