Added new post-elaboration data structures that will be more user-friendly to access