Update spring model to follow Inquiry Space pattern for data collection and export