Updated validation, Added teacher data.