Made major reisions to the data context.