Support for exhilarate

Change-Id: If472f67049c8dbf403d3d918e4f920b5eadcd3bc