added course class and fixed user class