Added in the logic for OS support