Plugin rewrites for version 0.1