Add database lengths PROPERLY