Performance upgrade and Bugfixes