Add updated types from master.