wip update_types

Change-Id: Ib1b2af6b2b8e260ece1ea929966c88b7710ff52f
wip

Change-Id: I188cf8e06972fe4198ceb1ba82fb45eba92d16b9
Still WiP

Change-Id: I1dfb9b2b86e36006284eec19a9948cc6f6e3b369