Add support to nested variables