Add cargo support