Separated model, added shortcuts to Data.all methods