fix ORM and new validator(may be done)