Examples updated to new spec