Refactor/move eip to backend