[TASK] Add OFFSET handling (from)