Updated with some 0.6.0 tweaks