Added support for multiples platforms