Minor update to return an object from database.open