Updated for master/0.7