Added ESWrapper service