Refit schema to structure + others