Added support for objectless esis