Updated to use 0.7.0