Rewrite legacy handles