Data model and classes added