Adjusted to the new data schema