added Substance and Organism class