Unit Table upgrade