Added ComponentAdapter