added raw Class implementation.