Removed model dependency from query execution