Replaced tid with eid
- fixes #93
- fixes #94