Some stubs added