added constructor to User and changes to User Mapper