Improve speed performance