+1; we can move these two up to DatabaseNode...