Adapting validator to new system