Correct architecture from 'any' to 'all'