Add logging
Use the mapper to validate on the fly mapping