Work on blueprint api-sample-sorted