Add handling of operation attribute