Added classes with stubs