Improve validates interface