Better multi-platform support