Added data model and storage.