Some validations added

Some validations added