Add support for exercises