Added topicId to model and added support for fluent interface