Feature rewrite