Add topic check and update