Use host detection instead of OS specific classes