CHANGED: Work in progress on UserStore