Added DataStorage class as DAO