Consider opening a separate pull request for these attribute additions.