Removed support for offset
Removed support for offset