Associated and nested topics plus some refactoring