Modify Consumer to support Topic functionality