Fixed the helpers to use validation tokens