Added generic variables provider

Implementation for #68