Added support for OpenKeyval