Add database improvements