Huajie's change on models.scala