Modifying to start making more data immutable.