Improve stubs