Adding support for offset and limit.