Update to new inner attribute syntax