Removed decider since it's already been moved.  Updates to the upload code to deal with changes in attribute names.