Improve doc samples