Enhanced all and data methods in model