Changed DB Diagram and DB Structure