Added hm-rewrite