refactor assets management (WIP)