Added more logging
Possible fix to NPE issue
Drastic changes to Term model. Embeddable key removed, replaced by composite key