Improvements over the course module