#4 #5 Supporting multiple modes add/remove with option to override at snippet level