Implement os v1 and v2 replacements