Enrich annotated enter and exit phases