Updated with v0.2 features.