Validation checks added.