Regarding the 'Index 2 out of bounds for length 2' error it seems that when an embeddable object(HoldingCompanyAddress) contains more attributes than the containg object (HoldingCompany) the error occurs. Seems that stateArrayPosition in AbstractStateArrayContributorMapping is calculated based on the containing object properties rather than the embeddable object. stateArrayPosition should be 4 in for HoldingCompanyAddress instead of 2 which is calculated based on the number of properties of HoldingCompanyAddress