Fixing traits to construct the right data now.