pruned non query methods and added support por include and extend