Added support for multiple platforms