refactoring ocf. Including enabled condition