Upgrading to current validator lib