Refactor asset types thing