Refactoring to OpenNTF API