Added map object resolution via dictionary lookup, more formatting