Adding operating system checks