Add initial tag checker