Making more fields private