Work on debugger friendly data models