Modified available commands to use new options.

Change-Id: Id4454a8d3d24f182a8489c82b92c4e65fa40be52