Fix samples to use Type instead of Set