Added in variable functionality