Change config structure to fix merge problems