Updated for 0.13 nightly