Update and improve samples