Added database organizing tools