Range fix and plaintext map support.