Added new attribution parameters for data wrappers
Minor reorder of files
Added new search parameters