Added ComponentLoader