Refactored to use topics support in natty

Same here