ArchiOpti improvements