Changes to allow for generation of data