Updated to remove many relationship issue