Updated with 0.4 changes