rework autoconfiguration