Change type to asset-aware