Improve on sialan-tools