Component Change: add some implementation