Changed code to reflect the new taxonomy structure