Improved sample config