Refactored Docking station