Adding support for attributes with hyphens and underscore