Added ComponentStore