Add v0.3 support, untested