Updates for 0.7 (WIP)