Added componentmodel upgrader - cheers Tyson