More variables added