Accomidate code for arrays