Updated to allow dynamic topics set from messages