Fixing the data to include ids