Handle new configuration and fix bugs