Added support for new platforms