Asset feature refactoring (WIP)