Continue refactoring and improving active record mass-upload