Better handling of variableS