More changes to move away from dummy data