Added more stubs