changes to componentmanager