Fix List and Map detection in transformer