Added organism parsing