Legacy rewrites