Added support for more custom attributes