Add command/query exercises