Adding more robust architecture support