Updated lists to static arrays