Reorganize the parameters for target storage