updated validation and matched VS model names