Added extended params

Change-Id: I31417f1873ac1f26727d29b9824470a4a7d3dede