#49 Add componentModel "jsr330"
o Refactor the other component model implementations to reduce code-duplication
Correct indentation of property mappings with conversion
#49 Minor fixes