OS type support added