Updated to match SquidLib updates