Make organization classification really optional