Added ModelQuery & ModelCommand