Finalized for 0.9.0