Roy|000|Made options list generic

Change-Id: I5788203d62f6ba2f7d8f359c687a54b52ce3518b