Changes for data testing