Protected properties

Change-Id: I70cb2f3aa654a8c127d5f78d146d7a8faa1f96bb