Updated Variable parsing