WCMS-187 Improve Course model.