Switch to JustArchi Optimization