Changed architecture from any to all