Pluggable properties mapping.
Reformat code.
Merge branch 'pluggable-properties'