Working on nuodb support