Improve Species and Reaction classes