Changed regex for variables