Add v0.1 features