Renamed package download fields, optimizations