Change configuration file format

Change-Id: Idee37807b94a58999ee61472456f0442c52a0f32