Updated exercise generation