Add conditional for setting
Add init of array