Fox mapping helpers, better exception handling, removed logging of base64 encoded content
Minor changes