Add support for asset id