Support for the new assets system