Improve cargo support