Finalize decision on parameters

Change-Id: I92e74ad492f81fa8c1b7344b83e913a2b5386ff7