Added consumption of courses via match conditions