Some classes moved to validation