Updated assetManagement