BUGFIX : Account for instance_attributes elements within operations