Added command line passing

Change-Id: I99e071f124b3a062464dfad672ccdbab10fbe140