Add detection of architectures