#1024 Refactoring SymbolicOCP (reworked)