rework schema manifest imports code