Added cargo support