Few Changes to DB Model