Refine declaration data structure