Adding components fore streaming and composition