Renaming of variables
Handling of new annotations
Updated to support framing and other parametrizations