Added checks for os types for system module.