Slight modifications to API an install

Change-Id: Ic887f3900d180cd776b3ce1d563693842e2a86ca