Changes to OS class