Modifications to support 'supported_product' and pipes, cleanups to come later