Add User Class and some other small changes