Fix map key and value data type can not be other struct type issue