Added support for multi platform