Squid integration changes