#9 Passing source bean name into macro, re-ordering parameters
#1 Adding conversions for number types
#1 Improving formatting of generated code