Refactored to ArrayLists and Get Set