Made command and query models more explicit