Refacto of dart samples