Updated docking station and van classes