Changed some properties from public to protected