Improve and optimize performance