Expand attributes

[#58301200]