#9 Add a macro for performing the non-iterable mappings
#9 Passing source bean name into macro, re-ordering parameters