Adding more stubs