Changed mapper to emit JSON serialized values for Collection types