Updated the way the layout data is passed through the domain