More OO changes for topics