Refactor oparent for independent versioning