Add compatibility with validator