Added support for security tags