Added architecture checks