Fork to work on validator tool.