Further work on sample #1 for endpoint-creation tutorial