Added multi-platform support in features