Improved OS support