Added support for different OS types