Feature/2.x optimizations