JENA-1789: Isomorphism fix and refactor
13 files changed