Added ComponentList Compliance