Made some class members protected