Updated to reflect 0.7 features