Move validator to MatesUtils