Add long long, remove time_t (temporarily)