Added ESI support option