Refactor asset management