Updated Evolution factories to accept species