Performance improvements. V2.2