Database Model updated