Added before/afterExecution to help capture values before they're cleared