FIX #2: Added macos impl for watch-service