A few changes to access data.