Fix validation and update documentation