More refinement of data model and interfaces.