Added defines for when tag support is enabled