Added support for EOT