Added further support to specify custom variable names.