First attempt to create the high level data structures in order to
maintain product compatibility.