In preparation for 0.4.0