Added Eshell support