Added few field validations