Updated Handler with stubs