Update type to asset-aware