In preparation for 0.6.1