Add missing package, add mising parameters, fix functions. Change-Id: Ib885af7df8fc2b678272fe85e5d8bbdd9aa1988b