changed Database structure severely