few modification for nuodb