Reorganized attributes section