Move building of mapper header to Mapping::Definition
Add ability to provide a custom mapper instance