Some validations added.