Improve stub