Updated TopicIdentifier

work in progress