Small changes in Data model