Updating diagram to latest spec