Renamed a couple of methods in InterceptorUtil
Cleaned up some code in InterceptorUtil
Converted serialization of map entries to be done by a json library