More changes related to change of 4D data structure