prepare for associateId support