Architecture updated to use Generic JPA Dao for relational data