Added cross-platform support