Added support for custom attribute names.