Added support for multiple different operating systems