Remove extraction to simple type and use always the polymorph type