Update module diagram again
Updates for 2.0