Improved freeze tools for borschik (https://github.com/veged/borschik)