Refactor entries so it can be re-used by relationship fields
Fix #33