Better model structure for data handling (DAO)