Add groups to facilitate importing only a subset of data
add reply patch file with corrected whitespace