Renamed includes method to including and added excluding method to ORM