Add support for additional classes
Add support for additional properties.