Add a FishScheme class and other things