Improve check for architecture