Updated Validation