PCJS-991 - Switch to object declaration instead of array