Added user class and properties