Added users class and other stuff