Added DB support. Removed dist-upgrade. Modified data directory