Refactor varioud default properties

FIXME : Config merging algorithm needs tweaking to work properly

Change-Id: I96b779b571a58271a6e18152d3ea23959d15da9f