Prototype: Sample improvements