updated User class and helper module