Added some interfaces and stubs