Add in Variable support