Added support for all platforms