Adding working unsettable options

Change-Id: Idc1d5fd20f3d27fcf32ba480f29652322568343e