Split into OSP 5 and OSP 4