Improved typing perfomance