adding feature to enable/disable options

Change-Id: Ifc2a535cb608a437d5fbaa731b16d1e210aea115