Improved van functionality