Added empty array checks for allowing configuration overrides