Removing special attribute handling (non-optional reference)