Refactor AssetService