Improve validator interface