Updated stubs