Adapt to new squid