Added ability to not specify component.