Additional configuration file changes. Properly assigns ids now, still have a conflict somewhere.