Added new setup for ES