Add support for custom data attributes