Removed use of ArrayList