Further refactoring.
Fixed replaced initializer causing many failures. Base classes are ignored.