Added grammar
Added query builder