Everything uses the new structure mapping.