Performance improvements

further performance improvements and jmeter test case
concerns #776