Updated for 0.8 rlease