Added support for custom attributes