Staged for 0.0.4.