Updated javadoc
Added Topic support.