Added some stubs for needed functionality