Added ability to disable components