I think we need to do the same on PocoEntityTuplizer