Added: Metrics and Addons support.