Improve typing performance