Port to new OS types