Add support for dashes in custom attribute names