Update with our new stubs