WP-2638 Added new non-course fields