MapAbstractType logic improved