Added OS-based visibility classes