Configuration - xml with additional parameters.

Change-Id: Id78ef3dda3e0b93c6f01005241538b6702adb002