Asset refactor