Adding support for double typed variables