Improve snap creation (#38)