Added variables to baseclass