updates to try and remove the concept of asset_type 3