added taxonomy handling