Update to new inner attr syntax