Rebuilt with proper data object.