Added Model and Query dcl classes