Update and Added JustArchi v2 optimisations