Small changes to userStore and Coordinate to respect encapsulation