added custom taxonomy support