Eleaph Adaption
* adapt client and server to new Eleaph changes