Annotated hibernate model and refactored it, refs #49