Add support for custom attributes