Changes to support Resolutions rewrite.