New Database structure and data source changed