Added a better way to add components.