More Work on UserRepository