Performance improvements, reduce the memory usage by 10%