Added direct offsetting for variables