Change structure, loader and parser