Changed: Auto include Metrics