Replaced neo specific sub classes by common impl-classes.