Changes to Komponenten-Manager