Updates to validation and type check.