Add fish on-demand loading