Newer attributes

Creating a pull request for this because it seems that I can't comment on the diff otherwise.