Changed component to enitity