Adding support for runtime class defintions