Refine structure
Update schema loading logic