Refactored DockingStation