Adding keyrange and handling diff better.