Updated OS support