Change <> to {} and add named or statements