Improve time performance