Updated to latest resolver collector