OWF config refactoring.

Code review changes.