Added more stubs.