Add in ArchiDroid Optimizations