Refactor/update locations management #255

See #255