Updated config for 2.1 features