Finalized for v0.9.1