Issue #4: Fix hibernate lazy fetch issues.