Further Event Upload work and schema modifications.