Employer or Client Address in previous work history section in DS-160?

On my F1 OPT, I was working onsite at a client location in CA but employer headquarters was in NJ. The previous work history section in the DS-160 form asks for the employer’s name, address, job titel, supervisor name. I want to check if the following is correct:
Employer Name: Employer in NJ,
Employer Address: Client Location in CA,
Job Title: My job Title
Supervisor Name: My Client Manager I reported to and phone number,
My I20 has CA location and my paystubs had the employer address in NJ
Thank you.