More ApiExample improvements