refactor asset management