Move to new assets system