Updated array lists and constants