Work on restoring 0.2 support