Updated to NoSQLDB 2.0