Use new fishing api