Moved extra validators from main project to appropriate project.