Add a few more examples based on WG feedback