Add i686 support & improve arrays of dependencies