Adding new 0.7 features. Pending Pull Request.