Added offset support