added some changes in validator class