Finalized for version v0.9.2