Add variant tags for subblocks & a bunch of new connection conventions