Added user and class table