Add simple context skipping
Rename