Model and Db enhancement again