Fix public vars to protected, add accessors

Change-Id: Id2264318cf4a69763c63ca50d635e26f321c7a4a