Updated to reflect new conceptual mapping