Feature/os specific steps