Added component management.