Changed visibility of public api (location is now public again)