Improved time and space performance