Added support for asset taxonomy