Add DerivedClasses of related items; refactor/cleanup