Supporting non-Amazon providers is added