Improvements on ESI plugin
15 files changed