Improve command/query exercises