Updated stubs to work with the reworked code.