User class. Minor Changes