Some changes to asset manager api