Updated the variables loading method to load variables per data source, using the new web service.

Signed-off-by: ohanetz <o.hanetz@gmail.com>