Isn't this specific to 'System' and breaking the agnostic nature of the Nutupane service?