Fixing engine to support adhoc actions

Change-Id: I5c57f4741e9c9ebc68cc180559633e30b1c615c2