Updated for new 0.7.0 milestone 2