refactor(models:module): improve validator