Added all the stubs