add pairs for command and query