Update to include all platforms