Rewrite for 0.3.0