Updated
Moved first two enrichments to use Scalaz Validation lib