added missing classes/stubs