Enhance Db and Model