fixing data schema