Update for 0.0.2 features