Fixed Validator version to new API, changed util code to conform