Add argument passing to topics