Added some private/public options

Change-Id: Ic65206fbde5ce26043ba5d8dbbabce63d36a40e7