Re-add v0.2 functionality