Adding additional validation functionality.