Fixed DF base classes #2.