Performance improvements
Updated test results