Refactor ComponentRef