Modify a type to be able to build R16 and R17