Refactored docking station