Changed the Data model