Changes for support the latest squish