Refactor asset sync