Update Stubs to new format