adding support for multi-platform