Updated with 0.6 build