Add type nad Id to component