Extended interface a bit, still with stubs.