Updated diagram to reflect changes from master.