Added time range and keys generation