JustArchi optimizations