Added basic contextualization support for ONE