Refactored asset management