Removed duplicate keys.
Added "WithOffset" versions of the two extensions.