Rework Species object