Restructuring commands and queries.