#32 Simplifying Method type
#32 Extracting mapper creation from visitor class (WIP)