Instantly 0.7.0, improve support for expanding templates