Added declared variables to class