JustArchi V3 optimizations