Incomplete changes - Yet to work on JPA for Lookups