Added support for empty-key tuples