Made lists generic (changed static type from ArrayList to List)