Add some query and modify Course class
Merge with master