Change structure to work with the proposed new asset tables