Server to GEI functionality added