General purpose update. Also added models