Moved merging all data to validation.
Updated to new function names.