Refit schema to structure