Isolating @Single (future potential removal) + now trigger on --optimize