Additional variables support added