Improvements started with Course class