Re-enable Metrics/Attributes