Revert "Revert "NewOption ontology improvements""

This reverts commit 6feb3136674e03353ab0803c8aad3741956a4dee.
Merge branch 'master' of https://github.com/krajj7/pikater