Better cross-platform support