Modified the relationships from one to one to many to one for both pojos