Fish and FishManager added