Updated diagram to include more tables