Added some Component management support