Updates to conceptual model