Add offset support