Enhancing it with stubs