Added database config back for tracking