Add switch annotations