JDF-54 Adding implementation with and without stored offset.
Deprecated the old implementation.