Update location for custom type and add prelim cmb2