Updated config to work with 3.5