Improve some performance